<<<<<<< HEAD
public class Calculator{
	public static void main(String[] args) {
		int a,b;
		Scanner sc = new Scanner();
		System.out.println("Please input first int number:");
		a = sc.nextInt();
		System.out.println("Please input second int number:");
		b = sc.nextInt();
		int result=0;
		Calculator c=new Calculator();
		result = c.add(a,b);
		System.out.println(a+"+"+b+"="+result);
	}
	public int add(int x, int y) {
		return x+y;
	}

		
		
		
		
		
		
		
		
		
		
		
		
		
		
		
	}
}
=======

package com.example.demo;

import android.app.Activity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;

public class MainActivity extends Activity {

	@Override
	protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.activity_main);
	}

	@Override
	public boolean onCreateOptionsMenu(Menu menu) {
		// Inflate the menu; this adds items to the action bar if it is present.
		getMenuInflater().inflate(R.menu.main, menu);
		return true;
	}
>>>>>>> 320b85534710c1d33c6cbd5c7f1df476b34b8cfc
